move it above notify