Nice refactoring Tanya!