Still having problems with picking the right changesets