A couple modifications