Updates by Fichtner