added few modifications/scripts