+ p161, p637 solved