before service rebuilt
before service rebuilt
initial version after restructuring