Preliminary version using WSMP