New version, less bugs