don't use return inside a repeat{}
converted opportunities to use did{}