ok this should be working now