Re-enabled ahg stuff.