bugs fix and dangerous system