Feature: modify with jeklly initial