Almost works better now