Updated latest working code.

We tested these today (3/9), and they both work.