states 0 & 1 commands cleaned up