Refined commit

what's up with the iterator?