Update from community origional