Improve next function
Rebuild packages