b7a6d95 updates from @joyclee