Modifications to API thing