@rgranadino could we pop this in a helper method as well?