Updated with dictionary mode.

Keep working on it!!