Incorporate Mathias' feedback for quick reference