working to improve API
updated:wq