Improve calendar