Added raise counter
Fix merge faults