Updated with simplification.w