added commune and clean up