Compile John's changes