1. Added a bit more checking to the rcmd thing to make more sure that this