some updates
Api work