Yes, 16 weeks is still probably about right. The first part of the process tends to be quite quick but there is around 8 weeks to wait, after an assessment, until the decision.
Nothing on this board constitutes legal advice - always consult a professional about specific problems