minor editing for subs 1 -> 18