Modify and Integrate calandar part