Add solution for 5.5 and 5.8