Update from original

Latest changes