upgraded the commands to support the arguments properly