moved stuff into constructor
changes in the collision check