removed validation and added one of the things back in