simple update

consolidated code