Proper calendar handling & example in demo