...
made changes per Colin on 12/18