merged latest from Bradley