Move method to correct location