changes from Kris Kowal