Command improvements

Picture check is now improved