Changed PR structure to a flat, iterable array. Implemented last comment.