need to change a few lines
# general
j
need to change a few lines