next year need to make this easier to manage