implement second scenario, entries servie, refactor