moving to singleton structure