edmond fix & edmond simple version