Completed issue 13 updates