My improvements