Hopefully working better