the refactor will help here