Re: changes for OOB calculations