Moved the border calculation to the collect method.