Still not looking right, but so much better