Important changes

Feel free to ask me about these changes.