Update on database and Main/Service
fixed merge