Further changes to craig1"