Simplify simulation further