Spike calendar ( refactor )