Further corrections and changes for testing