Add counting
Fix conflict and fix bug
Fix sim
Remove print