some changes that weren't included in previous commit