Issue #4 - dont use hardwired constants