I hear you on the frustration! All great changes to make 🙂