Changes from ElasticWolf