Yes, like this better than my initial version. Updated.