update from Jiri Kadlec