A few more changes to the untested code...