Sync2

Small modifications