removed to separate better now that doing more