updated to match new goals