Refactored to squire