+ bringing into line with latest changes to core