- calendar manipulator made more functional