added collision and entities