updated recent changes