stop gap measure before refactoring