Updated Code Samples