Added Logging,
Combined source and commandsource