Fixed 5- and added 5-18.