got it working better