Api finalized 2