Re-merge our code

Just so you have a revised version :)