1.8.4 with changes from peregrine