Still not the fastest, but a real attempt this time :)