add a bunch of stuff to sec. 15