Add comments or P/W for issues 25 and 26.