improve mutability - work in progress ..