Temporarily change some things to work for us

To refactor later