Improved Implementation