flashlight change/merged fixed scripts