Merged all the image cmds, moved to cmdln + sub-user OK