Updating to add blocking on the commands