Here's what I did. (I'll put the rest in other comments)