changed around some parsing for (this and next)