Old changes

Changes done before sync tragedy happened...