Updated from v10f