Improve run method