Added check for ms or fs.