Added for JA_DEV