added Actor scenarios
optimized version using FJP