Added in 2.1+ hooks to make it look better on 2.1+