applied with some minor cleanups...