removed commands and added click