Many changes + bibilo