Updated app with Validates