Adding latest hawkeye code.