Made changes to 14 and 17