Updated to match class demo