made whole timeout behaviour optional for now to allow testing