Added more sources and obstacles