Improved Steam.cs