Changed to driver structure