Implemented 'new' version of 'api', 2014-06-16