Changes before adding in wifi