merging with latest baystation