Integrated changes asked by sudorandom