Various changed from Jonathan

concur