add some code in remember when