Modified calendar helper