Implemented on S-99123

Hey it works!