Final commit by Karthik reapala