simplify
fix inverted bool