Up to date commit

Apart from Calendar activity