syncing latest to fix settings error