updated to use com.jkbff.common