Some changes to wireless deck