Calendar context enhanced - made logic simple