More work on Hawk.