Agata's improvements