Updates for Issue 8, tested