big update

potential problems!
one more