Added calendar and other things