Finished implementing version 1 of new range analysis