few changes on scripts