caught up in refactor 2