Refactoring, add aright answer, uses responders