simplified code
simplified code