Changes to resolve path, and updated draw style