improve edit system not finished yet