some other changes, tested over one week