lots of changes [kekkonen]