still fixing sync issues