updates from Omid