updated to include some debug and test results