working tags; refactored driver hooks