Updated to allow building; not actually tested