In the works: BAM upgrade mechanism