Move method so it's only called when necessary