Switched to CSV bases system