Sync with last updates from dey feedback