Added calendar function and updated