#75 and upgrade samples