Issue #45: moved source around; reduced visibility where possible