Wouldn’t mind this in the future