Fixed person's comments
Fixed synchronization issues
Fixed synchronization issues