Maybe it would be better to keep this around for the future?