Major refactoring by Vic...asteroids only broken