applying updates from vongott