More work on the totally unnecessary BIRD feature!!!