Fixed the WHOLE LIFE and 10 Year issue