second try

lots of updates