Fixed up goal creation