Simplified code
Simplified code