reworked @base.sync