updated samples with the new framework