Updated Goals to use Goal Value instead of Target Value