merge in Tobi's changes