Added more function...

... As a result it may broke.