Changes to Logic + calendar