Major fix in almost everything