Updated Demo Code