1.01 Code changed for better readebility