Calendar now works with graphics engine.
merge