modify: separate next() function,

but still mad with enter key listener for next :/