Added changes from Bamford