Replaced Shay's fast settle code with Reid's code