Brought back collisions made in later commit. Connected them with rest of code