more core updates for ryan