Upgraded to require 7.0