Fix and improve