minor changes @calendar