updated commands and controller