Next/previous is working a bit better