changes to scriptgen and views2
conflicts