Wait, I have a few more little changes to add :)