Changes didn't work, merged solution 10