Edited: a few changes of scripts