Compressor Code Rework