Re-work for HTML part. Stage 1/3