this commit serves as backup... the modified files have not been tested...