Incorporate comments from Musu