This is a much better solution