re-committing to capture aforementioned changes