modify on 20140623 - keep wifi on