Revised solution