Apply changes mostly done