I think I've fixed the Savage solution
YAYAYAYA CODE WORKS