Optimized experience listener and added more sources!