A lot of changes

a lot..