Merged changes, now runs again