Changes made to match calendar class