normalize with 7 Chandlee; trim conditions
fix prior commit