bug correction (renaming adap to Adap)
+ last modif in order to comply better