update from original

-first steps