tweaks to 16 and inital commit on 17