Updated fiddel