Droid1

merge to fix all