Honestly, I don't even remember what changes I've introduced here...