EDIT: Oh, and could you provide a source to that 2016 deadline? I don't remember anything like that, but it might just be my memory.