Commit of Spyros' entries by Jonathan