Thank you devs for 2 features!