Added input santitation