removed static variables