Refactored, changed argument style