Project_HPJapan fixed to use the new variables