modify calendar implementation