Fix: review and current modif