#2 dictionary fix, also reversed call order so most recent is first