Rewrote to use player entity