Another attempt at simplifying