Changed everything to non-static