[REVERT] Reverting to previous functionality (kept notes and commented out code).