db update + some changes stashed