valasFUPA
merge conflict resolved