Address Charlotte and Tim's feedbacks.