HACK: Update goal code similar to

6a4c6bd66948f907666d4d1374453e1dc110e436
HACK: Attempt to fix goals tab
HACK: This codes seems unused/does nothing