trying to refactor... without testing