Added next and previous, moved data handling