Merged my scuniverse changes in to 3.1