More work on b calendar
More work on b calendar