FS-48 FS-47 move to client