Refactoring answer-machanism