is this any better? seems simpler