I think this might be an improvement