Grabbing run method and a few other changes