final commit for jan 22nd