JLP --> refactor to privat/public, step 1