Made the user entry better