Commented out enhancement return temporarily