I think it would be great to make this better