Solved 157 and 158