Update design, ensure that goal is tied to correct user