hmm not a fan of this check.. can you just do a hasClass or something instead ? or just leave it as before?