Adding validate only function - needs to be adjusted