move assignation of
merge ralf's changes