Amend solution for last two questions

version 1.2