some changes, added calendar