Adams, Coles closer to Tokyo 2020 target