This should remain in the callback(success + error)
@EragonJ What do you think?