Fix and enchance