Refactored to use async callback, but broken get next page