1. Update tis to Naemar comments