Updated version :D (because stuff works more or less).