Rebases a function to client; also additional changes