Changes we collaborated on past 1am

Use at your own risk