Updated with latest bass-grid build