Hopefully this will work better