committing previous changes to trunk