rewrote parts due to introduction of drone