Portrait functions restored, including composites for citizens(!)