Update 4

Last updates done