BAD: update on refactor