separation of ctrls and re-factored for new result format