Adding Divan to the solution