Updated the non-memo path