Removed so it works without static variables