[IMP] Improved code as per TESTING IN review.