Improved exercise 4 even more