move to package of initial
move to package of initial
better solution