Changed up goals to be more dynamic