updated working in some kind of fashion