updated working