initial service code re-design
initial service code re-design - part2