fixes
simlify
fix