Looking much better now