is this handled somewhere else now?