tweaking includes and testing sync