todos updated; some change in services