merge in the modification on basic strategy