Remove entering/leaving (not sure if it was working)