[IMP] Improved code