I think this is better than the original