add looking ahead of more than 1 back in, cleaner now
cleanup