Hs dev

merge after Gaia challenge 2