Removed static from the variables which had it.