A bit better this time