Issue 3 updates