I think this is an improvement