Further updates. Dodge implementation still buggy