correcting != issue again?
deleted unnecessary variables