4.0 update

@Inactive1 give me update