Updated to match new hbro version.