added db parse + changed stuff