Piece highlighting now correct