fixed collision, but everything is a bit unpropotional now