Last update before integration w phone