worked on collison & entities