This is working better now