Craig: Updating code base to version 1.42