refactor for Lukes qualms