added some dictionary work