pushed os_api changes