editDiscuddion more changes