Small update to goal calculation