Sync commit; various changing still to be followed up.