Refactored to take advantage of launch