Cleaned up Composite driver