Some more changes to every class...