I have updated the post to reflect #1 - thanks for pointing that out!