Integrated changes from Hendrik