Changes before live testing