prepared for merge with BB_master (structure & chart2 cleaned up)