I just merged the two threads to keep everything together.