Break out into separate method