Many changes by Chalom and Olveira