removed static functions