separate apc and apcu driver
bugfix
more testing