Huge improvement, problems with API