hopefully cleaned all the mess from next and previous