some interesting changes

Signed-off-by: riabop <riabop@gmail.com>