fixing goal ownership
fixing goal ownership