diff w/ bsa changes