Demo Code Changes