Some little changes to All.cs