Altered quail branch version.