18.1 and 18.4 solved