added 2.6 API