Now uses SquareListener