Sync with Edc

change so fit for PC and EDC