updates from Shimon