need to alter validation logic