Updated version of BAPS. For internal testing only.