added wireless and extended general