rebuilt with @jrpruit1 added!