removing @ from some things to see if that helps