Second commit after adding validations