there shouldn't be any need for changing api in this area afaics.