update for hp300 merge