Updated / doc'd