Changed handling of actions