Changes to solution 18