Task8 improved