refined some of the commands