adding changes to API as requested by Yuji