updated for savagecraft v6