Finished implementing all changes from Jason.