updated for j4
1st draft