Important changes

Feel free to ask me.