Is this being handled some other way now?