Issue #15 - still sticking with the standard scheme for now.