Redo Liam W's changes