adapting api to yuji's needs