updated for jaggernaut v2.1.1 and friends