thanks for refactoring this!