Newer version of msl...wip...