Updates for Issue 6, need to update the docs