Some work done
j7 fix