worked on collison & base files