Updated to fit the views of MSF