Still needs to fix real-time validation