Adding missing shit for JP