Port of answer-functionality added