Implemented new version of 'api' (date unknown)