Improved code...