Added droid flags and more logging