fixed dictionaries
added basic implementation of the expansion method