Added Jonathan Wakeleys edits