Changes from Zak and Tyson