Updated driver with key functionality
Key based tidy up