Finishing implementation of synchronisation - WORKING