Cleaned up code for iRemember