Ported updates to 101