bug gixing
organize