Clean Version of Tani and Nolfi