IMO we should do these things all at once otherwise someone will eventually run into some trouble.