Update 4.0
Many modifications...-_-