Update by Nayzo 9