Editable Activities and lots of changes