reworked services.py and related to work better