Calendar feature

Fixed calendar feature