updated for entropy tracking