very ugly commit to sync stuff