Looking though old code, small changes