changed database and some other things