some test and modifications