More hacking to make sim better and more exciting