Some more changes to methodology