Add required library.  How did this work before?  Ugh...
Code cleanup