- merged BenM's changes