My changes, feel free to roll back ;)