updated for api and ser