removed notify to solve cycle