last changes
merge problems
merging href to pictionary