final commit
lot of changes