Not final! Dont sync

Just see the changes, which has to be done