Some irrelevant changes committed. Just not to lose the code