Update by Nayzo 7