Rework 121-125

Signed-off-by: Ray Lehtiniemi <rayl@mail.com>