Treasure changes

we should merge this in