Update 5

Big important changes applied!