UPDATE GET FROM DB
FIX conflic