Modified Pattern, add todo