Better collision
Added player