Adapted to DeepaMehta 4.3