Adapted to DeepaMehta 4.4