Made the command somewhat idiot proof