added better dictionary