Final changes from Josh Bloom
Finalize Josh Bloom code