Revert "Revert "Smaller update""

This reverts commit e37f400c60ea8d7f806a5534e5e5d212278b0ca2.