Major revision of various based contributions