Final touches based on this mornings feedback