Move into its own method