Issue 13 updates