A lot of changes

second version