second move attempt...hope not to loose the commit history