Added flashlight
merge