Major update (2)

Some files were not commited