partially added new API