Improve customizing
Fix comparison bug