Addressing comments from Steve & gnarf