modified commands, fixed indentation