Necessary changes

Serious stuff