Merge Initial BS Changes