added db and some useless elements