Implemented new oneByOne strategy