Merge Austin's code from 5/7.    Hamster Version: 2.3