Updated source to require 1.7