Some improvements, we are close to presentation ready