OC and entrophy tweak-much faster now