slightly graphic improvements