no more useless [0] or [1] in the code