it now runs all the way through