[IMP] I have this improved code....