Hopefully this is more efficient.