add static cal need change to dynamic