(feat) fix pending functions to work with the server