Slightly improved (but there is still room for more)