simplify everything pt.2