updated for the 1b/2b selection