Final: Working version with Services