updated calendar addressing #367 and #366