fixed order; changed hook back to connect