pj01 removed magical numbers