#10877740147860 : little changes to the code