updates after more discussion