changes to support switch cpu
changes to support switch cpu