Changes for task #38.