add calendar patch back in