improved: map cycle generator