Movement

The last two pull request were broken because of netbeans git plugin :/