DanielService class, modified again