Update

BJ general changes.