New: Some more changes