Modified to 12bit
Merge with remote