major revamp - remove compression