Adjusted some set up commands