Fix for new Marvin
All scripts updates for the new marvin stuff
updates