#40 Add LP and BP modes