Feature/goal update