updated working with stuff