[IMP]Improved code