Changes from Ivendor