new data and stars
conflicts merged