update build, highlight logic