Changed everything to static

again