A bit better now