commit before implementing service
few more changes