update to accomodate our new direction