added functionality to plus
merge with miguel calendar