Still changing some things on database