lots of changes -> use of GAIA for now