Added changes from Jeroen