Maybe fixing the database thing