Re-modified DB and app