Calendar added while bugs exist