adding Birdy
update corbeau
fixing json
merges