Modify 2.2 Bird Code