Changes following Quarx's implementation