Fixed the API, less retarded now