Did some other changes