merged LP and Bo changes, works