changes from Zeke