Changes before format
Merge, hope it works