Issue #64 and Issue #72 Updates for refactoring and group fix.