Modifications on the scripts