modified hehe
fix confix done