Major improvement

Signed-off-by: M.Satrya <satryabima24@gmail.com>