Changed handling and outputs