Fix & improve