Fixed collisions, Added reset functionality