Change things to match CyanKang