added OnEntityEnter & OnEntityLeave