Reverted Attempt and Improved Naming