some test code and changes