Incorporate feedback from Daniel Wu