Improve answer method