First minor modifications to original code
First minor modifications to original code