added some output for testing
some merge