This fixes the delay issues.

Still need to implement new command set