Made everything non-static