this makes slightly more sense to me. @chrisjwu, does it look right to you?