on resume and on arrival fix