Working through to polish it